Keep the same libtool version as the standalone libgail-util had. Bug #504643.

svn path=/trunk/; revision=19210

diff --git a/ChangeLog b/ChangeLog
index 71b2a31b9c598bf2da6cf044b8eadb1e85616c49..0763dc39e6e55d0794829ebb18f9d2174b73e510 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,17 @@
+2007-12-20  Christian Persch  <chpe@gnome.org>
+
+       * configure.in:
+       * modules/other/gail/libgail-util/Makefile.am:
+       Keep the same libtool version as the standalone libgail-util had.
+        Bug #504643.
+
 2007-12-20 15:30:09  Tim Janik  <timj@imendio.com>
 
        * Makefile.decl: generate HTML reports for test-report perf-report full-report.
 
 2007-12-20  Alexander Larsson  <alexl@redhat.com>
-
-        * gdk/x11/gdkapplaunchcontext-x11.c:
+        
+       * gdk/x11/gdkapplaunchcontext-x11.c:
        Update for gio API changes
 
 2007-12-20  Richard Hult  <richard@imendio.com>

diff --git a/configure.in b/configure.in
index 58ea15787ed0a6e5f85a94fa1d0ad27dc5d6a923..47e354fe4959c6b7303eb2a36f8af71a5ffd7960 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -93,6 +93,13 @@ LT_CURRENT_MINUS_AGE=m4_eval(lt_current - lt_age)
 AC_SUBST(LT_VERSION_INFO)
 AC_SUBST(LT_CURRENT_MINUS_AGE)
 
+m4_define([gail_lt_current],[18])
+m4_define([gail_lt_revision],[1])
+m4_define([gail_lt_age],[0])
+m4_define([gail_lt_version_info],[gail_lt_current:gail_lt_revision:gail_lt_age])
+m4_define([gail_lt_current_minus_age],[m4_eval(gail_lt_current - gail_lt_age)])
+AC_SUBST([GAIL_LT_VERSION_INFO],[gail_lt_version_info])
+AC_SUBST([GAIL_LT_CURRENT_MINUS_AGE],[gail_lt_current_minus_age])
 
 #
 # gdk-pixbuf gets versioned separately, and for now, using standard

diff --git a/modules/other/gail/libgail-util/Makefile.am b/modules/other/gail/libgail-util/Makefile.am
index 428ac9e3a0462ea7ce29305b100016757ae23b96..7141713d69fb8d5d356119895091c12d9d050a61 100644 (file)
--- a/modules/other/gail/libgail-util/Makefile.am
+++ b/modules/other/gail/libgail-util/Makefile.am
@@ -62,13 +62,13 @@ libgailutil_la_LIBADD = \
        $(GTK_DEP_LIBS)
 
 libgailutil_la_LDFLAGS = \
-       -version-info $(LT_VERSION_INFO)        \
+       -version-info $(GAIL_LT_VERSION_INFO)   \
        $(no_undefined)                         \
        $(export_symbols)                       \
         $(LDFLAGS)
 
 gailutil.lib: libgailutil.la gailutil.def
-       lib -name:libgailutil-@LT_CURRENT_MINUS_AGE@.dll -def:gailutil.def -out:$@
+       lib -name:libgailutil-$(GAIL_LT_CURRENT_MINUS_AGE).dll -def:gailutil.def -out:$@
 
 install-data-local: install-ms-lib install-libtool-import-lib